Merge tag 'upstream/2_rc2+svn358' into experimental

Merge tag 'upstream/2_rc2+svn358' into experimental

Upstream version 2~rc2+svn358

Conflicts:
	CMakeLists.txt
	examples/full_test.cpp
	include/mgl/base.h
	include/mgl/base_cf.h
	include/mgl/canvas_cf.h
	include/mgl/define.h
	include/mgl/mgl.h
	include/mgl/parser.h
	include/mgl/qt.h
	lang/CMakeLists.txt
	src/axis.cpp
	src/base.cpp
	src/base_cf.cpp
	src/canvas.cpp
	src/data.cpp
	src/parser.cpp
	src/pixel.cpp
	texinfo/CMakeLists.txt
	todo.txt
	udav/CMakeLists.txt
	udav/qmglcanvas.cpp
	udav/qmglcanvas.h
	utils/mglconv.cpp
	widgets/fltk.cpp
	widgets/qt.cpp